Don't start new components when activating the screen-shield in gdm

Previous code was activating the networkAgent and telepathyClient
in the lock-screen, irrespective of the previous mode.
Now it checks if the session mode is locked down, and if so it refuses
to start new components.

https://bugzilla.gnome.org/show_bug.cgi?id=683400

diff --git a/js/ui/components/__init__.js b/js/ui/components/__init__.js
index 763c87d7b037dc07fd370b41f61947b58fcb716d..cb370199d4a68d1f2d4ebbc9d58906fbcee90b1c 100644 (file)
--- a/js/ui/components/__init__.js
+++ b/js/ui/components/__init__.js
@@ -41,6 +41,9 @@ const ComponentManager = new Lang.Class({
         if (component)
             return component;
 
+       if (Main.sessionMode.isLocked)
+           return null;
+
         let constructor = this._importComponent(name);
         component = new constructor();
         this._allComponents[name] = component;
@@ -49,7 +52,8 @@ const ComponentManager = new Lang.Class({
 
     _enableComponent: function(name) {
         let component = this._ensureComponent(name);
-        component.enable();
+       if (component)
+            component.enable();
     },
 
     _disableComponent: function(name) {